Making OC agent not cause big problems (again).