adjusted validation #179