fixed quotes issues