Additional fix for #28 Timeout waiting for connection from pool