Agenda aspect fix