Resolves connection ordering issue