(fix) Fix for typemap changes.