Fix issue 760