- Fixes issue #20