Fixed any conflicts when activated with Bundle.