issue 692 fixed