Fix contract extend