Fix argument rearranging