Feature #4977: Fix update finish detect issue