fix issue 9561