Fix unquie address count being incorrect