Fix agent finder method