#6 #8 Fix agent lag loop