ticket:5 - fix settings