Add call to shutdown-agents for correctness