- Fixes issue #29