Fixed another validator issue