fixed enumerate