Calendar un-fix