Eldar: Fix new connection generator.