Fix conection id - refs BT#8340