Corrected validation to match spec