fixes the wrappers.
Merge pull request #311 from fmoloney/WrapperFix

fixes the wrappers.