Fixing some argument logic