diff --git a/autolens/__init__.py b/autolens/__init__.py
index cc519be0a..bcbac9b6a 100644
--- a/autolens/__init__.py
+++ b/autolens/__init__.py
@@ -16,6 +16,7 @@
 from autoarray.operators.over_sampling.iterate import OverSamplingIterate
 from autoarray.operators.over_sampling.iterate import OverSamplerIterate
 from autoarray.inversion.inversion.dataset_interface import DatasetInterface
+from autoarray.inversion.inversion.mapper_valued import MapperValued
 from autoarray.inversion.pixelization import image_mesh
 from autoarray.inversion.pixelization import mesh
 from autoarray.inversion import regularization as reg
@@ -42,12 +43,17 @@
 from autoarray.structures.mesh.rectangular_2d import Mesh2DRectangular
 from autoarray.structures.mesh.voronoi_2d import Mesh2DVoronoi
 from autoarray.structures.mesh.delaunay_2d import Mesh2DDelaunay
+from autoarray.structures.triangles.shape import Circle
+from autoarray.structures.triangles.shape import Triangle
+from autoarray.structures.triangles.shape import Square
+from autoarray.structures.triangles.shape import Polygon
 from autoarray.structures.vectors.uniform import VectorYX2D
 from autoarray.structures.vectors.irregular import VectorYX2DIrregular
 from autoarray.structures.arrays.kernel_2d import Kernel2D
 from autoarray.structures.visibilities import Visibilities
 from autoarray.structures.visibilities import VisibilitiesNoiseMap
 
+
 from autogalaxy import cosmology as cosmo
 from autogalaxy.analysis.adapt_images.adapt_images import AdaptImages
 from autogalaxy.analysis.adapt_images.adapt_image_maker import AdaptImageMaker
@@ -108,6 +114,7 @@
 from .point.fit.positions.source.max_separation import FitPositionsSourceMaxSeparation
 from .point.model.analysis import AnalysisPoint
 from .point.solver import PointSolver
+from .point.solver.shape_solver import ShapeSolver
 from .quantity.fit_quantity import FitQuantity
 from .quantity.model.analysis import AnalysisQuantity
 from . import exc
diff --git a/autolens/analysis/result.py b/autolens/analysis/result.py
index 6c191e215..4e6b78906 100644
--- a/autolens/analysis/result.py
+++ b/autolens/analysis/result.py
@@ -235,6 +235,12 @@ def source_plane_inversion_centre(self) -> aa.Grid2DIrregular:
         """
         if self.max_log_likelihood_fit.inversion is not None:
             if self.max_log_likelihood_fit.inversion.has(cls=aa.AbstractMapper):
-                return (
-                    self.max_log_likelihood_fit.inversion.brightest_pixel_centre_list[0]
+                inversion = self.max_log_likelihood_fit.inversion
+                mapper = inversion.cls_list_from(cls=aa.AbstractMapper)[0]
+
+                mapper_valued = aa.MapperValued(
+                    values=inversion.reconstruction_dict[mapper],
+                    mapper=mapper,
                 )
+
+                return mapper_valued.max_pixel_centre
diff --git a/test_autolens/analysis/test_result.py b/test_autolens/analysis/test_result.py
index 4e46ecf4d..50809b671 100644
--- a/test_autolens/analysis/test_result.py
+++ b/test_autolens/analysis/test_result.py
@@ -137,11 +137,17 @@ def test__source_plane_inversion_centre(analysis_imaging_7x7):
         samples_summary=samples_summary, analysis=analysis_imaging_7x7
     )
 
+    inversion = result.max_log_likelihood_fit.inversion
+    mapper = inversion.cls_list_from(cls=al.AbstractMapper)[0]
+
+    mapper_valued = al.MapperValued(
+        values=inversion.reconstruction_dict[mapper],
+        mapper=mapper,
+    )
+
     assert (
         result.source_plane_inversion_centre.in_list[0]
-        == result.max_log_likelihood_fit.inversion.brightest_pixel_centre_list[
-            0
-        ].in_list[0]
+        == mapper_valued.max_pixel_centre.in_list[0]
     )
 
     lens = al.Galaxy(redshift=0.5, light=al.lp.SersicSph(intensity=1.0))