- trying to fix iterator getting stuck