Fixing the incorrect value for the quote option

**Warning:** This branch should be rebased and merged after #147 is reviewed and merged into dev.