Fixed to work with the lastest versions of swig.