Proper escaping of string, ref #23