FIX: substituted next with zip in enumerate