Attempt to avoid decodeURI issue