Revert to list comprehension to preserve order