- Fixes issue #25