Another enumerate fix