Should have fixed issue with average speed