diff --git a/TurnIn.lua b/TurnIn.lua
index dfed718..204db26 100755
--- a/TurnIn.lua
+++ b/TurnIn.lua
@@ -563,7 +563,11 @@ function TI_HandleGossipWindow(gorq)
 							for i2,v2 in ipairs(GossipOptions) do
 								if (v2.name == current.name) then
 									TI_debug(i1.."-Gossip Match Found: "..current.name..", "..current.type);
-									TI_FunctionList.g.gossip(i2);
+									if(v2.args) then
+										TI_FunctionList.g.gossip(v2.args);
+									else
+										TI_FunctionList.g.gossip(i2);
+									end
 									return;
 								end
 							end
@@ -605,7 +609,8 @@ function TI_HandleGossipWindow(gorq)
 				for j,val in ipairs(GossipOptions) do
 					if(val.type == current.type) then
 						TI_ResetPointers();
-						TI_FunctionList.g.gossip(j);
+						TI_debug("Selecting Gossip Option "..j)
+						TI_FunctionList.g.gossip(val.args);
 						return;
 					end
 				end
@@ -726,6 +731,11 @@ function TI_TabulateGossipUIInfo_Retail(guis)
 		temp.icon = gui.icon;
 		temp.gossipOptionID = gui.gossipOptionID
 		temp.orderIndex = gui.orderIndex
+		if (TI_IsRetail()) then
+			temp.args = gui.orderIndex
+		else
+			temp.args = i
+		end
 		table.insert(x, temp);
 	end
 	return x;
@@ -781,7 +791,7 @@ if (TI_IsRetail()) then
 		g = {
 			availquest = C_GossipInfo.SelectAvailableQuest,
 			activequest = C_GossipInfo.SelectActiveQuest,
-			gossip = SelectGossipOption,
+			gossip = C_GossipInfo.SelectOptionByIndex,
 			getavailquests = C_GossipInfo.GetAvailableQuests,
 			getactivequests = C_GossipInfo.GetActiveQuests,
 			getoptions = C_GossipInfo.GetOptions,
diff --git a/TurnIn.toc b/TurnIn.toc
index baa5f05..3db6423 100755
--- a/TurnIn.toc
+++ b/TurnIn.toc
@@ -1,5 +1,5 @@
-## Interface: 100005
-## X-Compatible-With: 100005
+## Interface: 100007
+## X-Compatible-With: 100007
 ## Title: Turn In
 ## Notes: Automates the selection of quest and gossip options.
 ## SavedVariables: TI_status, TI_NPCDB, TI_NPCIndex