OOIION-1788: Small bug fix for instrument agents
Merge pull request #2004 from mmeisinger/fix1788_bug

OOIION-1788: Small bug fix for instrument agents