Fixed some none iterations