fix issue 11964