diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
index 085533f79210a857dcbb5db0b5a1e8790dcbccb1..a564de6429841667ec3b7aab0a773d3240a4e168 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
@@ -92,9 +92,10 @@ public class ConvertToolImageTransformer implements IStreamingImageTransformer
 
     private final boolean useGraphicsMagic;
 
-    ConvertToolImageTransformer(String arguments, ToolChoice choice)
+    ConvertToolImageTransformer(String arguments, ToolChoice choiceOrNull)
     {
         this.convertCliArguments = parseCommandArguments(arguments);
+        ToolChoice choice = (choiceOrNull == null ? ToolChoice.ENFORCE_IMAGEMAGICK : choiceOrNull);
         switch (choice)
         {
             case ENFORCE_IMAGEMAGICK:
@@ -130,8 +131,9 @@ public class ConvertToolImageTransformer implements IStreamingImageTransformer
     {
         try
         {
-            // TODO 2011-08-31, Franz-Josef Elmer: Uncomment when new fast method is working correctly for colored images
-//            byte[] input = ImageUtil.imageToPngFast(image);
+            // TODO 2011-08-31, Franz-Josef Elmer: Uncomment when new fast method is working
+            // correctly for colored images
+            // byte[] input = ImageUtil.imageToPngFast(image);
             byte[] input = toByteArray(image);
             byte[] output = transform(input);
             return toBufferedImage(output);