diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 7d4208dfb..1c5eb1872 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1650,10 +1650,9 @@ void RawImageSource::colorSpaceConversion (Imagefloat* im, ColorManagementParams
                 #pragma omp parallel for
                 for (int i=0; i<im->height; i++)
                     for (int j=0; j<im->width; j++) {
-						//TODO: extend beyond 65535
-                        im->r[i][j] = CurveFactory::gamma (CLIP(gd*im->r[i][j]));
-                        im->g[i][j] = CurveFactory::gamma (CLIP(gd*im->g[i][j]));
-                        im->b[i][j] = CurveFactory::gamma (CLIP(gd*im->b[i][j]));
+                        im->r[i][j] = CurveFactory::gamma (gd*im->r[i][j]);
+                        im->g[i][j] = CurveFactory::gamma (gd*im->g[i][j]);
+                        im->b[i][j] = CurveFactory::gamma (gd*im->b[i][j]);
                     }
             }
 
@@ -1763,9 +1762,9 @@ TMatrix work = iccStore->workingSpaceInverseMatrix (cmp.working);
                 #pragma omp parallel for
 				for (int i=0; i<im->height; i++)
 					for (int j=0; j<im->width; j++) {
-						im->r[i][j] = CurveFactory::gamma ((gd*im->r[i][j]));
-						im->g[i][j] = CurveFactory::gamma ((gd*im->g[i][j]));
-						im->b[i][j] = CurveFactory::gamma ((gd*im->b[i][j]));
+						im->r[i][j] = CurveFactory::gamma (gd*im->r[i][j]);
+						im->g[i][j] = CurveFactory::gamma (gd*im->g[i][j]);
+						im->b[i][j] = CurveFactory::gamma (gd*im->b[i][j]);
 					}
 			}
 
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index b947121d3..aff271c9b 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -169,6 +169,7 @@ ICMPanel::ICMPanel () : Gtk::VBox(), FoldableToolPanel(this), iunchanged(NULL),
     icamera->signal_toggled().connect( sigc::mem_fun(*this, &ICMPanel::ipChanged) );
     iembedded->signal_toggled().connect( sigc::mem_fun(*this, &ICMPanel::ipChanged) );
     ifromfile->signal_toggled().connect( sigc::mem_fun(*this, &ICMPanel::ipChanged) );
+    igamma->signal_toggled().connect( sigc::mem_fun(*this, &ICMPanel::profAppGammaChanged) );
     ipc = ipDialog->signal_selection_changed().connect( sigc::mem_fun(*this, &ICMPanel::ipSelectionChanged) );
     saveRef->signal_pressed().connect( sigc::mem_fun(*this, &ICMPanel::saveReferencePressed) );
 
@@ -353,6 +354,11 @@ void ICMPanel::ipChanged () {
 
     oldip = profname;
 }
+
+void ICMPanel::profAppGammaChanged() {
+    if (listener) listener->panelChanged (EvIProfile, "");
+}
+
 void ICMPanel::GamChanged() {
     if (batchMode) {
         if (freegamma->get_inconsistent()) {
diff --git a/rtgui/icmpanel.h b/rtgui/icmpanel.h
index 78c91feb5..b508c7cdc 100644
--- a/rtgui/icmpanel.h
+++ b/rtgui/icmpanel.h
@@ -78,6 +78,7 @@ class ICMPanel : public Gtk::VBox, public AdjusterListener, public FoldableToolP
         void gpChanged ();
 		void GamChanged ();
         void ipSelectionChanged ();
+        void profAppGammaChanged();
 
         void setRaw (bool raw);
         void saveReferencePressed ();