RE: Fix in validation conditions