Fixed handling of quotes