Bug Fix on Quotation