Fixed next_day calculation