Temporary fix for calendar problems.