Client RPT fix