Fix RRouter