Fixes issue #8