Fix/#26 average speed