Really fix the time calculation