Settings bug fix