Fix non-deterministic sorting of bundles