Fixed problems introduced by externalizing the bundle