OK,... time to fix this iterator