Make C-FUN generate calls properly