Fix issue 769