part 2 of last fix