fix extends/overrides resolution