Fixed fatal join bug