diff --git a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot
index 7873018..78cc222 100644
--- a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot
+++ b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot
@@ -341,14 +341,14 @@ Get-PolicyIds
     ${policyIds}    Create List
     
     FOR    ${policy}    IN    @{value['data']['policyList']}
-        ${policyIdList}    Create List    ${policy['policyId']}
-        ${policyObj}    Create Dictionary    policyType=${policy['policyType']}    policyIds=${policyIdList}
-        Append To List    ${policyIds}    ${policyObj}
-        #Log To Console    ${policy['referenceObject']}
-        #${objectType}    Evaluate    type(${policy['referenceObject']})
-        #Log To Console    ${objectType}
-            
+        #${policyIdList}    Create List    ${policy['policyId']}
+        #${policyObj}    Create Dictionary    policyType=${policy['policyType']}    policyIds=${policyIdList}
+        #Append To List    ${policyIds}    ${policyObj}
+        Append To List    ${policyIds}    ${policy['policyId']}    
     END
+    ${len}    Get Length    ${policyIds}
+    ${policyIds}    Run Keyword If    ${len}==1    Set Variable  ${policyIds[0]}
+    ...    ELSE    Set Variable    ${policyIds}
     [Return]    ${policyIds}
 DeletePolicyWithParamDict
     [Documentation]