better iteration of last bugfix