issue #436