Make bundle creation deterministic