Fixes issue #352.