[mr2579] Fix Calendar crash