issue #19917: Fix validation order.