Fixes RTT calculation

Merged Gijs Peskens requested to merge rtt_calculation_fixes into master

Merge request reports