Fix bundle order