fix issue 10017