To issue #385 completed