Bugfix with Settings