t516: Fix the problem when the update and old validation stays.