Fixes issue #472.