UPDATE: Fixed RPT violations
BUGFIX: Fixed RPT violations
BUGFIX: Fixed RPT violations
BUGFIX: Fixed RPT violations
Merge pull request #664 from benjamij/rpt-fixes

RPT violation fixes