Templates: Fix Iterator