- Fixes issue #30