More validation fix