fixed argv handling