Escaping characters properly now