diff --git a/Framework/Built_In_Automation/Desktop/Windows/BuiltInFunctions.py b/Framework/Built_In_Automation/Desktop/Windows/BuiltInFunctions.py
index 6c254a17b..d30516466 100644
--- a/Framework/Built_In_Automation/Desktop/Windows/BuiltInFunctions.py
+++ b/Framework/Built_In_Automation/Desktop/Windows/BuiltInFunctions.py
@@ -2341,15 +2341,16 @@ def save_attribute_values_in_list(data_set):
                 right = right.strip()
                 if "target parameter" in mid:
                     target.append([[], "", [], []])
-                    temp = right.strip(",").split(",")
+                    temp = right.strip(",").split('",\n')
                     data = []
+                    temp[-1] = temp[-1][:-1]
                     for each in temp:
-                        data.append(each.strip().split("="))
+                        data.append(each.strip().split("=", 1))
                     for i in range(len(data)):
                         for j in range(len(data[i])):
                             data[i][j] = data[i][j].strip()
                             if j == 1:
-                                data[i][j] = data[i][j].strip('"')  # dont add another strip here. dont need to strip inside quotation mark
+                                data[i][j] = data[i][j][1:]  # dont add another strip here. dont need to strip inside quotation mark
 
                     for Left, Right in data:
                         if Left == "return":
diff --git a/Framework/Built_In_Automation/Mobile/CrossPlatform/Appium/BuiltInFunctions.py b/Framework/Built_In_Automation/Mobile/CrossPlatform/Appium/BuiltInFunctions.py
index 7b6c5c6e6..c890b628f 100755
--- a/Framework/Built_In_Automation/Mobile/CrossPlatform/Appium/BuiltInFunctions.py
+++ b/Framework/Built_In_Automation/Mobile/CrossPlatform/Appium/BuiltInFunctions.py
@@ -4058,15 +4058,16 @@ def save_attribute_values_appium(step_data):
                 right = right.strip()
                 if "target parameter" in mid:
                     target.append([[], [], [], []])
-                    temp = right.strip(",").split(",")
+                    temp = right.strip(",").split('",\n')
                     data = []
+                    temp[-1] = temp[-1][:-1]
                     for each in temp:
-                        data.append(each.strip().split("="))
+                        data.append(each.strip().split("=",1))
                     for i in range(len(data)):
                         for j in range(len(data[i])):
                             data[i][j] = data[i][j].strip()
                             if j == 1:
-                                data[i][j] = data[i][j].strip('"')  # do not add another strip here. dont need to strip inside quotation mark
+                                data[i][j] = data[i][j][1:]  # do not add another strip here. dont need to strip inside quotation mark
 
                     for Left, Right in data:
                         if Left == "return":
diff --git a/Framework/Built_In_Automation/Web/Selenium/BuiltInFunctions.py b/Framework/Built_In_Automation/Web/Selenium/BuiltInFunctions.py
index 93d92c2f8..8b6d96b1b 100644
--- a/Framework/Built_In_Automation/Web/Selenium/BuiltInFunctions.py
+++ b/Framework/Built_In_Automation/Web/Selenium/BuiltInFunctions.py
@@ -2730,15 +2730,16 @@ def save_attribute_values_in_list(step_data):
                 right = right.strip()
                 if "target parameter" in mid:
                     target.append([[], [], [], []])
-                    temp = right.strip(",").split(",")
+                    temp = right.strip(",").split('",\n')
                     data = []
+                    temp[-1] = temp[-1][:-1]
                     for each in temp:
-                        data.append(each.strip().split("="))
+                        data.append(each.strip().split("=",1))
                     for i in range(len(data)):
                         for j in range(len(data[i])):
                             data[i][j] = data[i][j].strip()
                             if j == 1:
-                                data[i][j] = data[i][j].strip('"')  # dont add another strip here. dont need to strip inside quotation mark
+                                data[i][j] = data[i][j][1:]   # dont add another strip here. dont need to strip inside quotation mark
 
                     for Left, Right in data:
                         if Left == "return":