Fix #368.
Fix wrapper generation.