Merge: lib/socket: Bugfix