Fixing backward compat when token in params