Fix the case when a remove triggers both 'updated' and 'removed' callbacks