Fix Routing issue with the modification, This can be merge now.