Calendar fix v1.1