Work around problem with new arg parser