Fix in ConnectionHolder