bug fix,code move