Fix connection pool issue