diff --git a/opossum/src/properties/property.rs b/opossum/src/properties/property.rs
index 2e416a1a510bee67c81dbdc42ad3ec894b3ff5a6..8277b59f72a066e82b885045e0b9eb67a7e1315f 100644
--- a/opossum/src/properties/property.rs
+++ b/opossum/src/properties/property.rs
@@ -195,8 +195,10 @@ impl Property {
                 ghost_hist.plot_view_direction = Some(vector![1.0, 0.0, 0.0]);
                 ghost_hist.to_plot(&file_path, crate::plottable::PltBackEnd::SVG)?;
             }
-            Proptype::WaveFrontData(_wf_data) => {
-                todo!()
+            Proptype::WaveFrontData(wf_data) => {
+                let file_path = report_path.join(Path::new(&format!("{id}.png")));
+                wf_data.wavefront_error_maps[0]
+                    .to_plot(&file_path, crate::plottable::PltBackEnd::Bitmap)?;
             }
             Proptype::HitMap(hit_map) => {
                 let file_path = report_path.join(Path::new(&format!("{id}.svg")));
diff --git a/opossum/src/ray.rs b/opossum/src/ray.rs
index 5166cd8f5854eb093300b862ce86dda660f8152f..7fc28160d2554394e36757f49fb5bf0aa846e1a8 100644
--- a/opossum/src/ray.rs
+++ b/opossum/src/ray.rs
@@ -492,7 +492,7 @@ impl Ray {
                 self.dir = refract_dir;
                 self.e = input_energy * (1. - reflectivity);
                 let mut reflected_ray = self.clone();
-                reflected_ray.pos_hist.clear();
+                // reflected_ray.pos_hist.clear();
                 reflected_ray.dir = reflected_dir;
                 reflected_ray.e = input_energy * reflectivity;
                 reflected_ray.number_of_bounces += 1;
@@ -1069,7 +1069,7 @@ mod test {
         assert_eq!(reflected_ray.pos, millimeter!(0., 0., 10.));
         assert_eq!(reflected_ray.refractive_index, 1.0);
         assert_eq!(reflected_ray.dir, -1.0 * Vector3::z());
-        assert_eq!(reflected_ray.pos_hist, vec![]);
+        assert_eq!(reflected_ray.pos_hist, vec![millimeter!(0., 0., 0.)]);
         assert_eq!(reflected_ray.path_length(), plane_z_pos);
         assert_eq!(reflected_ray.number_of_bounces(), 1);
         assert_eq!(reflected_ray.number_of_refractions(), 0);