Settings app bug fix