issue #387