fix handling on update