Can now deal with dropped connections