Shutdown-agents fix