issue #957 fixed