Fixing round robin in connection manager