small code clean and fix
v3.49.14