diff --git a/src/Utils/map_module.f90 b/src/Utils/map_module.f90
index 1d09e4e0..6a27ee9e 100644
--- a/src/Utils/map_module.f90
+++ b/src/Utils/map_module.f90
@@ -19,16 +19,16 @@ module map_module
  use omp_lib
  use iso_fortran_env
  
- integer, parameter             :: integral_kind = 16 ! 8
+ integer, parameter             :: integral_kind = 8
  
- integer, parameter             :: cache_key_kind = 4 ! 2
- integer, parameter             :: cache_map_size_kind = 8 ! 4
+ integer, parameter             :: cache_key_kind = 2
+ integer, parameter             :: cache_map_size_kind = 4
  
- integer, parameter             :: key_kind = 16 !8
- integer, parameter             :: map_size_kind =16 ! 8
+ integer, parameter             :: key_kind = 8
+ integer, parameter             :: map_size_kind = 8
  
- integer,   parameter           :: map_shift = -31 !-15
-!integer*8, parameter           :: map_mask  = ibset(0_8,15)-1_8
+ integer,   parameter           :: map_shift = -15
+integer*8, parameter           :: map_mask  = ibset(0_8,15)-1_8
 
   integer(kind=int16), parameter :: z_kind = 0
   integer(kind=int16), parameter :: o_kind = 1
@@ -50,8 +50,8 @@ module map_module
   integer*8, pointer             :: consolidated_idx(:)
   logical                        :: sorted
   logical                        :: consolidated
-!  integer(kind=map_size_kind)         :: map_size
-!  integer(kind=map_size_kind)         :: n_elements
+  integer(kind=map_size_kind)         :: map_size
+  integer(kind=map_size_kind)         :: n_elements
 
   integer(kind=int16)         :: map_size
   integer(kind=int16)         :: n_elements