Fixed duplicate connections