fix_some_issue