Fixing state model def.