Another corner case fix for day change swap