[FIX] Don't modify list while iterating