Don't store bunchspace as it may be updated
Merge pull request #1662 from wmtan/ProtectAgainstBunchSpaceUpdate

Don't store bunchspace as it may be updated