fixed double escaping