Fix with object update management