(fix) #noticket Fix to use correct IP address on which connection is received. You can work out the rest of the changes