Fix extends