Fix quotes creation