Fixed sourcing of Socket