New string escaping, should solve #2