Improvement in connection consistency. Related to #3