Fix argument functionality