Fix issue 6406