Fixed argv length check