Fixes issue #26