Fixed token_create