Adding some more escaping as per Daryl H.