fixing annoying join bug