Fix accounting for rule changes