fix issue 10003