Some loop fix