corrected handling of quotes