Fixes issue #22