Fixes issue #46.