Settings Bugfix