Fix issue 761