fix
Merge branch 'master' into settingCrashFix
Merge pull request #753 from olga-jane/settingCrashFix

Setting crash fix