Reorder subscription management in UnitStateGenerator

Fix #793