Fixes issue #34.