Fixed the validation again