More quotes are escaping without cause, fixes #42