Fixes issue #20