data validation fix