CO WORK (Yann - Quentin) - socket scope fix in client