Fixed pre escaping