Fix Argv extraction