Issue 34 fix

See my comment in issue #34