Fix for issue #306, thanks to tchajed (on github) for the pull request. The original patch was reworked a bit.