do some fix
fix