Fix hints creation