Fixed empty router issue