Fix arg checking