* Fixed broken connection bug