fixes issue #34