Fixed validateUniqueness