Fix for over midnight events