BUGFIX: Fixed RPT violation.