fix settings issues, #6