Fixed the settings bug EVEN MORE