Fix again wrong speed calculation