fixes issue #29