Fix issue #436.