dont stop connection every time there is failure
merged