Connection issues fix #472