Fixes issue #48.