Connection settings fix #3