Connection settings fix #2