Bug/move service socket