change join to resolve for default config