diff --git a/app/Http/Controllers/CharacteristicsController.php b/app/Http/Controllers/CharacteristicsController.php
index 02152c8..b27c5ae 100644
--- a/app/Http/Controllers/CharacteristicsController.php
+++ b/app/Http/Controllers/CharacteristicsController.php
@@ -2279,42 +2279,44 @@ class CharacteristicsController extends Controller
 
         $charMasters = ProductCharacteristicsMaster::with('workGroupMaster')->where('plant_id', $plantId)->where('item_id', $ItemId)->where('line_id', $lineId)->where('machine_id', $machineId)->get(); // ->select(['name', 'characteristics_type', 'inspection_type', 'lower', 'middle', 'upper', 'work_group_master_id'])
 
-        if (! $charMasters) {
+        if ($charMasters->count() <= 0) {
             return response()->json([
                 'status_code' => 'ERROR',
                 'status_description' => "Characteristics not found in product master table for the plant : '$plant->name'!",
             ], 404);
         } else {
-            $output = $charMasters->map(function ($charMast) {
-                $charMaster = [
-                    'work_group_master' => optional($charMast->workGroupMaster)->name ?? '',
-                    'name' => $charMast?->name ?? '',
-                    'characteristics_type' => $charMast?->characteristics_type ?? '',
-                    'inspection_type' => $charMast?->inspection_type ?? '',
-                    'lower' => (string) $charMast?->lower ?? '',
-                    'middle' => (string) $charMast?->middle ?? '',
-                    'upper' => (string) $charMast?->upper ?? '',
+            if ($charMasters->count() == 1) {
+                $charMasters = ProductCharacteristicsMaster::with('workGroupMaster')->where('plant_id', $plantId)->where('item_id', $ItemId)->where('line_id', $lineId)->where('machine_id', $machineId)->first();
+
+                // $workGroup = WorkGroupMaster::find($charMasters->work_group_master_id);
+                // $workGroupName = $workGroup?->name ?? '';
+
+                $output = [
+                    'work_group_master' => $charMasters?->workGroupMaster->name ?? '', // $workGroupName ?? '',
+                    'name' => $charMasters?->name ?? '',
+                    'characteristics_type' => $charMasters?->characteristics_type ?? '',
+                    'inspection_type' => $charMasters?->inspection_type ?? '',
+                    'lower' => (string) $charMasters?->lower ?? '',
+                    'middle' => (string) $charMasters?->middle ?? '',
+                    'upper' => (string) $charMasters?->upper ?? '',
                 ];
+            } else {
+                $output = $charMasters->map(function ($charMast) {
+                    $charMaster = [
+                        'work_group_master' => $charMast?->workGroupMaster->name ?? '', // optional($charMast->workGroupMaster)->name ?? '',
+                        'name' => $charMast?->name ?? '',
+                        'characteristics_type' => $charMast?->characteristics_type ?? '',
+                        'inspection_type' => $charMast?->inspection_type ?? '',
+                        'lower' => (string) $charMast?->lower ?? '',
+                        'middle' => (string) $charMast?->middle ?? '',
+                        'upper' => (string) $charMast?->upper ?? '',
+                    ];
 
-                return $charMaster;
-            });
+                    return $charMaster;
+                });
+            }
         }
 
-        // $charMasters = ProductCharacteristicsMaster::with('workGroupMaster')->where('plant_id', $plantId)->where('item_id', $ItemId)->where('line_id', $lineId)->where('machine_id', $machineId)->first();
-
-        // // $workGroup = WorkGroupMaster::find($charMasters->work_group_master_id);
-        // // $workGroupName = $workGroup?->name ?? '';
-
-        // $output = [
-        //     'work_group_master' => $charMasters?->workGroupMaster->name ?? '', // $workGroupName ?? '',
-        //     'name' => $charMasters?->name ?? '',
-        //     'characteristics_type' => $charMasters?->characteristics_type ?? '',
-        //     'inspection_type' => $charMasters?->inspection_type ?? '',
-        //     'lower' => (string) $charMasters?->lower ?? '',
-        //     'middle' => (string) $charMasters?->middle ?? '',
-        //     'upper' => (string) $charMasters?->upper ?? '',
-        // ];
-
         return response()->json($output, 200);
     }