Address model bug fix