Token location bug
bool return