'Enumerate' bug correction + test case.