fixed: small bugs on quotes