fixed big bug (now quotes are correctly managed)