ToU&RoR fixed