issue #636