Bug fix in ED Agenda