Fixed clients validation (comments removed)