Added Quote and Quoter fix