FIX: Fix Serhiy advice about number of connections