Hot settings fix