validator fix
Merge pull request #534 from willtp87/7.x.github_hatest_rebaseing

validator fix