Fixing repeating token bug