fixes issue #87