Fixes issue #21