Setting bug fix