Fix arg passing