fix current/last references