Make stop agent more stable