Fix Bundle implementation