issue #19917: Fix validation order.
Merge pull request #206 from jrogelstad/19917

issue #19917: Fix validation order.