Calendar bugfix