Fixing routing issue