Fixed validator issue