Time calculation improved

No match.