Fix argument passing