closer to validation fix