Fixed rti bugs round 2