Fix token call