OOIION-1788: Small bug fix for instrument agents