issue #802 fixed