Router current path generator fix