Fix loop submit bugs