- Fixes issue #16