fixed agent conflicts - fixes #254