fix argv handling