fix agenda and "fragmentization"