The same change needs to be done in a few other places such as in the changes in cwrap.c.