fixed 2 quot bugs