Fix current state