adjust to createbundle security refactoring