fixing validator