CHECKME: Changed rollback rules, not sure they'll be more stable…