fix to keep single connection