Fixing state store