Fix connect problem with original versions