Workaround url escape bug