Fix in validation conditions