Agent Update: issue 104