Fix issue 5762