Client tracking memory fix #1