Add support for shifts that span midnight