Join bug fixed