Refs #2075: fix on bundle creation