Iterator warning fix