add escaping back in