BUGFIX: Fixed RPT violations