Calendar bug hot fix