issue #987