possible fixes, per van der Peet.

I don't know if this will do the trick or not ... maybe it will.
Merge pull request #155 from linas/van-der-peet-fix

possible fixes, per van der Peet.