Router/Router :: Fix handler closure detection