refactor for fix in bundle