Attempt to fix list generation with or without iterator