fixes issue #8