issue #988 fixed