-Settings load logic fixed