#4080 add missing invariants during simulations