Fix extends problem