Router Issue Fixed