Fix problem with initial bundle load