Fix quote crash
Version 2.2.1
Merge remote-tracking branch 'origin/dev'