Fixing argv class