Quick fix in agent