Fixed client address bug