Extra handling for quotes