Bugfix on quotation