Fix input validation again