Remove join bug