fixed change-token bug