fixes issue #31