[Connection] Bug fix