Workaround for issue with agents using decorators