Fix argument binding