fix current_state issue (issue #* ongoing)