diff --git a/.gitignore b/.gitignore
index 6d30387..335ec95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/elements-alexandria-2.14.1.tar.gz
+*.tar.gz
diff --git a/elements-alexandria.spec b/elements-alexandria.spec
index ce49a9d..fe7405e 100644
--- a/elements-alexandria.spec
+++ b/elements-alexandria.spec
@@ -1,7 +1,7 @@
 Summary:        A lightweight C++ utility library
 Name:           elements-alexandria
-Version:        2.14.1
-Release:        7%{?dist}
+Version:        2.16
+Release:        1%{?dist}
 License:        LGPLv3+
 URL:            https://github.com/astrorama/Alexandria.git
 Source0:        https://github.com/astrorama/Alexandria/archive/%{version}/%{name}-%{version}.tar.gz
@@ -9,8 +9,10 @@ Source0:        https://github.com/astrorama/Alexandria/archive/%{version}/%{nam
 # It is downloaded from:
 # https://upload.cppreference.com/w/File:cppreference-doxygen-web.tag.xml
 Source1:        cppreference-doxygen-web.tag.xml
+# Fix a bad memory access when fixing an axis
+Patch0:         elements-alexandria_fixaxis.patch
 
-%global elements_version 5.8
+%global elements_version 5.10
 
 BuildRequires: CCfits-devel
 BuildRequires: boost-devel >= 1.53
@@ -96,7 +98,7 @@ mkdir -p build/doc/doxygen
 cp "%{SOURCE1}" "build/doc/doxygen"
 # Build
 cd build
-%cmake -DELEMENTS_BUILD_TESTS=OFF -DSQUEEZED_INSTALL:BOOL=ON -DINSTALL_DOC:BOOL=ON \
+%cmake -DELEMENTS_BUILD_TESTS=ON -DELEMENTS_INSTALL_TESTS=OFF -DSQUEEZED_INSTALL:BOOL=ON -DINSTALL_DOC:BOOL=ON \
     -DUSE_SPHINX=OFF --no-warn-unused-cli \
     -DCMAKE_LIB_INSTALL_SUFFIX=%{_lib} -DUSE_VERSIONED_LIBRARIES=ON ${EXTRA_CMAKE_FLAGS} \
     ..
@@ -107,6 +109,10 @@ export VERBOSE=1
 cd build
 %make_install
 
+%check
+cd build
+make test
+
 %files
 %license LICENSE
 %{cmakedir}/AlexandriaEnvironment.xml
@@ -114,6 +120,7 @@ cd build
 %{_libdir}/libAlexandriaKernel.so.%{version}
 %{_libdir}/libConfiguration.so.%{version}
 %{_libdir}/libGridContainer.so.%{version}
+%{_libdir}/libHistogram.so.%{version}
 %{_libdir}/libNdArray.so.%{version}
 %{_libdir}/libMathUtils.so.%{version}
 %{_libdir}/libPhysicsUtils.so.%{version}
@@ -132,6 +139,7 @@ cd build
 %{_libdir}/libAlexandriaKernel.so
 %{_libdir}/libConfiguration.so
 %{_libdir}/libGridContainer.so
+%{_libdir}/libHistogram.so
 %{_libdir}/libNdArray.so
 %{_libdir}/libMathUtils.so
 %{_libdir}/libPhysicsUtils.so
@@ -146,6 +154,7 @@ cd build
 %{_includedir}/Table/
 %{_includedir}/XYDataset/
 %{_includedir}/GridContainer/
+%{_includedir}/Histogram/
 %{_includedir}/NdArray/
 %{_includedir}/SourceCatalog/
 %{_includedir}/Configuration/
@@ -161,6 +170,7 @@ cd build
 %{cmakedir}/TableExport.cmake
 %{cmakedir}/XYDatasetExport.cmake
 %{cmakedir}/GridContainerExport.cmake
+%{cmakedir}/HistogramExport.cmake
 %{cmakedir}/NdArrayExport.cmake
 %{cmakedir}/SourceCatalogExport.cmake
 %{cmakedir}/ConfigurationExport.cmake
@@ -175,6 +185,9 @@ cd build
 %{docdir}
 
 %changelog
+* Fri Jul 17 2020 Alejandro Alvarez Ayllon <alejandro.alvarezayllon@unige.ch> 2.16-1
+- New upstream release 2.16
+
 * Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 2.14.1-7
 - Rebuilt for Boost 1.73
 
diff --git a/elements-alexandria_fixaxis.patch b/elements-alexandria_fixaxis.patch
new file mode 100644
index 0000000..cf054f2
--- /dev/null
+++ b/elements-alexandria_fixaxis.patch
@@ -0,0 +1,22 @@
+diff --git a/GridContainer/GridContainer/_impl/GridContainer.icpp b/GridContainer/GridContainer/_impl/GridContainer.icpp
+index 1216714..f01133a 100644
+--- a/GridContainer/GridContainer/_impl/GridContainer.icpp
++++ b/GridContainer/GridContainer/_impl/GridContainer.icpp
+@@ -47,7 +47,7 @@ template<typename GridCellManager, typename... AxesTypes>
+ GridContainer<GridCellManager, AxesTypes...>::GridContainer(
+                       const GridContainer<GridCellManager, AxesTypes...>& other,
+                       size_t axis, size_t index)
+-      : m_axes{other.m_axes}, m_axes_fixed{fixAxis(other.m_axes_fixed, axis, index)},
++      : m_axes{other.m_axes}, m_axes_fixed{fixAxis(other.m_axes, axis, index)},
+         m_fixed_indices{other.m_fixed_indices}, m_cell_manager{other.m_cell_manager} {
+   // Update the fixed indices
+   if (m_fixed_indices.find(axis) != m_fixed_indices.end()) {
+@@ -155,7 +155,7 @@ template<typename GridCellManager, typename... AxesTypes>
+ template<int I>
+ GridContainer<GridCellManager, AxesTypes...>  GridContainer<GridCellManager, AxesTypes...>::fixAxisByIndex(size_t index) {
+   if (index >= getOriginalAxis<I>().size()) {
+-    throw Elements::Exception() << "Index (" << index << ") out of axis " 
++    throw Elements::Exception() << "Index (" << index << ") out of axis "
+                               << getOriginalAxis<I>().name() << " size ("
+                               << getOriginalAxis<I>().size() << ")";
+   }
diff --git a/sources b/sources
index 8e6b392..6bdcbdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (elements-alexandria-2.14.1.tar.gz) = d8d02e012b98ab4b548a279c82cf935dd1aed746b619f47d178d0bf0473c052578cec3b2237f6db2dfc25b0aba15a071bc56ef0bfcd70fc9fa4fec99ba64beb3
+SHA512 (elements-alexandria-2.16.tar.gz) = befe19616b037e478d6311bb840445bc5bcc5e5d55667ed53e1eda0d8b57241ab0029ddf2a59a550d258a903ba46d6aa178019327aaf742c77bcf55981974941