Fixed not updating issue