Fix for load token