some fix
bug fix