fix resolving of base definition