Calendar delegation fix