some fix like widgets