Quick validation fix