fix current addr and state