fixed showing current_state