Fixing state manager/state