Fix for circle loop