diff --git a/pkg/serdes.go b/pkg/serdes.go
index 8616a99..0bb71ab 100644
--- a/pkg/serdes.go
+++ b/pkg/serdes.go
@@ -111,7 +111,7 @@ func imageFromBuffer(buffer []byte, transform *ARAwareTransform, aspect_ratio fl
 		channels = img.Bands()
 
 		// Define bit depth de facto, not exposed in the vips interface
-		bit_depth = len(img_bytes) / (width * height * channels)
+		bit_depth = len(img_bytes) / (width * height * channels) * 8 // 8 bits per byte
 	}
 
 	if bit_depth == 0 && !pre_encode_image {
diff --git a/python/test_datago_db.py b/python/test_datago_db.py
index 75e0a00..9e26e08 100644
--- a/python/test_datago_db.py
+++ b/python/test_datago_db.py
@@ -6,7 +6,7 @@
 
 
 def get_test_source() -> str:
-    test_source = os.getenv("DATAROOM_TEST_SOURCE")
+    test_source = os.getenv("DATAROOM_TEST_SOURCE", "COYO")
     assert test_source is not None, "Please set DATAROOM_TEST_SOURCE"
     return test_source
 
@@ -160,6 +160,24 @@ def no_test_jpg_compression():
     ), "Embedding should be set"
 
 
+def test_original_image():
+    # Check that the images are transmitted as expected
+    client_config = get_json_config()
+    client_config["image_config"]["pre_encode_images"] = False
+    client_config["image_config"]["crop_and_resize"] = False
+    dataset = DatagoIterDataset(client_config, return_python_types=False)
+
+    sample = next(iter(dataset))
+
+    assert go_array_to_pil_image(sample.Image).mode == "RGB", "Image should be RGB"
+    assert (
+        go_array_to_pil_image(sample.AdditionalImages["masked_image"]).mode == "RGB"
+    ), "Image should be RGB"
+    assert (
+        go_array_to_pil_image(sample.Masks["segmentation_mask"]).mode == "L"
+    ), "Mask should be L"
+
+
 def test_duplicate_state():
     client_config = get_json_config()
     client_config["source_config"]["return_duplicate_state"] = True