bundle loading bug fix