fix cbagent incompatibility