bug fix: in_current_states flag cleanup