#386 Fix saving options