Fix issue 740