diff --git a/libraries/AP_Terrain/AP_Terrain.cpp b/libraries/AP_Terrain/AP_Terrain.cpp
index 65e8a1262d..134cb77ef7 100644
--- a/libraries/AP_Terrain/AP_Terrain.cpp
+++ b/libraries/AP_Terrain/AP_Terrain.cpp
@@ -402,9 +402,9 @@ bool AP_Terrain::allocate(void)
 
 namespace AP {
 
-AP_Terrain &terrain()
+AP_Terrain *terrain()
 {
-    return *AP_Terrain::get_singleton();
+    return AP_Terrain::get_singleton();
 }
 
 };
diff --git a/libraries/AP_Terrain/AP_Terrain.h b/libraries/AP_Terrain/AP_Terrain.h
index 3f2a875e95..3b8df3ffc7 100644
--- a/libraries/AP_Terrain/AP_Terrain.h
+++ b/libraries/AP_Terrain/AP_Terrain.h
@@ -440,7 +440,7 @@ private:
 };
 
 namespace AP {
-    AP_Terrain &terrain();
+    AP_Terrain *terrain();
 };
 
 #endif // AP_TERRAIN_AVAILABLE