improved last fix