Fix bundle build