Fixes the settings order #13