Fix of calendar