[#51382125] fix some code
[#51384417] fix some code