ticket:1 settings fix