diff --git a/src/targets/gnss_campaign/plot.py b/src/targets/gnss_campaign/plot.py
index 5fb4c939..263295a5 100644
--- a/src/targets/gnss_campaign/plot.py
+++ b/src/targets/gnss_campaign/plot.py
@@ -258,12 +258,20 @@ def draw_figures(self, problem, dataset, history):
             target.set_dataset(dataset)
             comp_weights = target.component_weights()[0]
 
-            ws_n = comp_weights[:, 0::3] / comp_weights.max()
-            ws_e = comp_weights[:, 1::3] / comp_weights.max()
-            ws_u = comp_weights[:, 2::3] / comp_weights.max()
-            ws_e = num.array(ws_e[0]).flatten()
-            ws_n = num.array(ws_n[0]).flatten()
-            ws_u = num.array(ws_u[0]).flatten()
+            comp_weights = comp_weights.A1
+            mask=target.station_component_mask
+            ws_all=num.empty(mask.shape)
+            i=0
+            for x in range(len(mask)):
+                if mask[x]==True:
+                    ws_all[x]=comp_weights[i]/ comp_weights.max()
+                    i+=1
+                else:
+                    ws_all[x]=num.nan
+
+            ws_n = ws_all[0::3]
+            ws_e = ws_all[1::3]
+            ws_u = ws_all[2::3]
 
             if ws_n.size == 0:
                 continue
@@ -297,7 +305,6 @@ def draw_figures(self, problem, dataset, history):
 
             yield (item, fig)
 
-
 def get_plot_classes():
     return [
         GNSSTargetMisfitPlot,