fixes to last state