Setting bug correction