Fixed redundant string escaping