huge fix foreach+Remove