Fixed so target remembers last state update