Better behavior on update