Fix bundle loading