Fix semantic of state