Router/Router :: Fix closures/superclosures management