Fix more logic of --fastest