Avoid errors due to '+' sign in payload