Fix for swig templates