Fix Bundle setup