Fix entry-update logic