Agent service fix