Actually fixes #135
Merge pull request #136 from abmargb/master

Actually fixes #135