faster and fix singlequote