Fixbug on calendar