refine RouterHandling fixes #94