diff --git a/components/mbColorLib/BAxisColorPicker.pas b/components/mbColorLib/BAxisColorPicker.pas
index af4edf660..e3fe70a4e 100644
--- a/components/mbColorLib/BAxisColorPicker.pas
+++ b/components/mbColorLib/BAxisColorPicker.pas
@@ -195,24 +195,19 @@ procedure TBAxisColorPicker.SetBValue(b: integer);
 begin
   Clamp(b, 0, 255);
   if b <> FB then
-  begin
-    FB := b;
-    SetSelectedColor(RGBToColor(FR, FG, FB));
-  end;
+    SetSelectedColor(RGBToColor(FR, FG, b));
 end;
 
 procedure TBAxisColorPicker.SetGValue(g: integer);
 begin
   Clamp(g, 0, 255);
-  FG := g;
-  SetSelectedColor(RGBtoColor(FR, FG, FB));
+  SetSelectedColor(RGBtoColor(FR, g, FB));
 end;
 
 procedure TBAxisColorPicker.SetRValue(r: integer);
 begin
   Clamp(r, 0, 255);
-  FR := r;
-  SetSelectedColor(RGBtoColor(FR, FG, FB));
+  SetSelectedColor(RGBtoColor(r, FG, FB));
 end;
 
 procedure TBAxisColorPicker.SetSelectedColor(c: TColor);
diff --git a/components/mbColorLib/GAxisColorPicker.pas b/components/mbColorLib/GAxisColorPicker.pas
index f0c9df649..e838dfaf6 100644
--- a/components/mbColorLib/GAxisColorPicker.pas
+++ b/components/mbColorLib/GAxisColorPicker.pas
@@ -193,25 +193,20 @@ end;
 procedure TGAxisColorPicker.SetBValue(b: integer);
 begin
   Clamp(b, 0, 255);
-  FB := b;
-  SetSelectedColor(RGBToColor(FR, FG, FB));
+  SetSelectedColor(RGBToColor(FR, FG, b));
 end;
 
 procedure TGAxisColorPicker.SetGValue(g: integer);
 begin
   Clamp(g, 0, 255);
-  if FG = g then
-  begin
-    FG := g;
-    SetSelectedColor(RGBToColor(FR, FG, FB));
-  end;
+  if FG <> g then
+    SetSelectedColor(RGBToColor(FR, g, FB));
 end;
 
 procedure TGAxisColorPicker.SetRValue(r: integer);
 begin
   Clamp(r, 0, 255);
-  FR := r;
-  SetSelectedColor(RGBToColor(FR, FG, FB));
+  SetSelectedColor(RGBToColor(r, FG, FB));
 end;
 
 procedure TGAxisColorPicker.SetSelectedColor(c: TColor);
diff --git a/components/mbColorLib/RAxisColorPicker.pas b/components/mbColorLib/RAxisColorPicker.pas
index 08ed5c4e8..ac054b979 100644
--- a/components/mbColorLib/RAxisColorPicker.pas
+++ b/components/mbColorLib/RAxisColorPicker.pas
@@ -191,25 +191,20 @@ end;
 procedure TRAxisColorPicker.SetBValue(b: integer);
 begin
   Clamp(b, 0, 255);
-  FB := b;
-  SetSelectedColor(RGBtoColor(FR, FG, FB));
+  SetSelectedColor(RGBtoColor(FR, FG, b));
 end;
 
 procedure TRAxisColorPicker.SetGValue(g: integer);
 begin
   Clamp(g, 0, 255);
-  FG := g;
-  SetSelectedColor(RGBtoColor(FR, FG, FB));
+  SetSelectedColor(RGBtoColor(FR, g, FB));
 end;
 
 procedure TRAxisColorPicker.SetRValue(r: integer);
 begin
   Clamp(r, 0, 255);
   if FR <> r then
-  begin
-    FR := r;
-    SetSelectedColor(RGBtoColor(FR, FG, FB));
-  end;
+    SetSelectedColor(RGBtoColor(r, FG, FB));
 end;
 
 procedure TRAxisColorPicker.SetSelectedColor(c: TColor);