fixes issue #123