Calendar fix 2