Fix issue #523.