Merge pull request #477 from pberde/master

Fix the missing agents issue