Fixed wrap over midnight