Fixes issue #7