BUGFIX: Fixed RPT violation.
BUGFIX: Fixed RPT violation.
BUGFIX: Fixed RPT violation.
BUGFIX: Fixed RPT violation.
Merge pull request #725 from benjamij/rpt-fixes-2

Rpt fixes 2