fix issue 16286