EList inside EMap fix