Fixes issue #10