diff --git a/Source/sources/Castro_geom.cpp b/Source/sources/Castro_geom.cpp
index 334672edbc..6bcb8b71bf 100644
--- a/Source/sources/Castro_geom.cpp
+++ b/Source/sources/Castro_geom.cpp
@@ -26,7 +26,7 @@ Castro::construct_old_geom_source(MultiFab& source, MultiFab& state_in, Real tim
       return;
   }
 
-#if AMREX_SPACEDIM == 2
+#if AMREX_SPACEDIM <= 2
   const Real strt_time = ParallelDescriptor::second();
 
   MultiFab geom_src(grids, dmap, source.nComp(), 0);
@@ -83,7 +83,7 @@ Castro::construct_new_geom_source(MultiFab& source, MultiFab& state_old,
       return;
   }
 
-#if AMREX_SPACEDIM == 2
+#if AMREX_SPACEDIM <= 2
   const Real strt_time = ParallelDescriptor::second();
 
   MultiFab geom_src(grids, dmap, source.nComp(), 0);
diff --git a/Source/sources/Castro_sources.cpp b/Source/sources/Castro_sources.cpp
index 1c4981a7db..8cf57f8b6b 100644
--- a/Source/sources/Castro_sources.cpp
+++ b/Source/sources/Castro_sources.cpp
@@ -61,10 +61,10 @@ Castro::source_flag(int src)
 #endif
 
     case geom_src:
-        if (geom.Coord() == 1) {
-          return true;
-        } else {
+        if (geom.Coord() == 0) {
           return false;
+        } else {
+          return true;
         }
 
 #ifdef DIFFUSION