Fix #34

Fixes issue #34