Fixes issue #25