Fix Escaping