Fix more usage of last nodes dictionary