Critical bug fix. Incorrect linking of function arguments