Fix for double encoded params