Make connection a bit more reliable