Fixed #683
Merge pull request #686 from normanjaeckel/Fix_Agenda

Fixed #683