Fix hub completion