Tweak to make the default to encode parameters