Mod: use state constant instead of raw value