Fixed double encoding issue