fixes issue #7