post-validation code fix - 1st go