validation fix up