Resolved issue with shifts ending at midnight going over two days