Modifying enumerator for 1.8.7