Critical Router bug fixed (hopefully)