Fixed double-escaping