Fix for_iterator