FIX: Average speeds not properly recorded