Fix for new token
