Committing code to fix enumerator problem because I am a doofus.