Fixes issue #42