Connection management is fixed