trying to fix escaping and quoting