Fixing settings bug