Apply Dominique patch about Elist issues