default join bugfix
refactoring