Fix issue related to the update procedure