Listening host fix #19