Preliminary fix for connection pool synchronization issue