CB-7904 removed improper argv usage