remove indirection and possible race case when initializing the agent