Fix aggressive StoreBoxes