added a fix for extending connections