Fix: remove from the loop