#930 modify Router class call position