fixed order current_state (1.4 adaptation)