Fixed validator bug