c_token fixed .. hopefully