Bug correction + join examples