Fix issue #423.