Fixed more validation.