some fix
Finish v2.6.1