Fix problems caused by additional escaping zeal