fix regression bug when fix issue CAL-911