Maybe fix for issue #472.