This is the common thing I have to fix in this pull request - do you have an example of an agent that does this? The postgres agent didn't have anything like this that I could see.