Proposed fix for #1285
Fix for #1201
Default to settings
Merge pull request #1347 from ghost1227/bugs/1201

Bugs/1201