Another loops fix