Fix issue 9172