Bugfix calendar