First attempts to fix the enumeration bug