diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
index a03411c3a2b433652d6d3bed27fdf3ec234c3ef5..089eb3fd30cafeabaad4e4e405897faa499adaec 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
@@ -124,7 +124,7 @@ public class HCSDatasetLoader implements IHCSDatasetLoader
         assert wellLocation.getX() <= getContainer().getNumberOfColumns();
         assert wellLocation.getY() <= getContainer().getNumberOfRows();
 
-        long chosenChannelId = // FIXME Jun 15, 2010, IA: tests
+        long chosenChannelId =
                 query.getChannelIdByChannelNameDatasetIdOrExperimentId(getDataset().getId(),
                         getContainer().getExperimentId(), chosenChannel);
 
@@ -143,8 +143,8 @@ public class HCSDatasetLoader implements IHCSDatasetLoader
                 if (imageDTO != null)
                 {
                     content =
-                        new ThumbnailContent(contentRepository.getContent(imageDTO.getFilePath()),
-                                thumbnailSizeOrNull);
+                            new ThumbnailContent(contentRepository.getContent(imageDTO
+                                    .getFilePath()), thumbnailSizeOrNull);
                 }
             } else
             {
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java
index a64bccc760f1e001017ff3f5471fbb454663dbe0..12bf8626e3b812fbee37b7f374e8cc285d2ea030 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java
@@ -138,6 +138,10 @@ public class ImagingUploadDAOTest extends AbstractDBTest
         AssertJUnit.assertTrue(channels[0] == channelId1 && channels[1] == channelId2
                 || channels[1] == channelId1 && channels[0] == channelId2);
 
+        // test get id of first channel
+        assertEquals(channels[0], dao.getChannelIdByChannelNameDatasetIdOrExperimentId(datasetId,
+                experimentId, "dsChannel"));
+
         List<ImgChannelDTO> experimentChannels = dao.getChannelsByExperimentId(experimentId);
         assertEquals(1, experimentChannels.size());