Fixed validator case bug