Fix for problems with quoteidentifiers 

Closes #693