Fix for the issue related to update of an entity.