RPT spam fix #2