diff --git a/include/boost/numeric/ublas/detail/config.hpp b/include/boost/numeric/ublas/detail/config.hpp
index ebc198f4..9e674105 100644
--- a/include/boost/numeric/ublas/detail/config.hpp
+++ b/include/boost/numeric/ublas/detail/config.hpp
@@ -33,26 +33,19 @@
 
 #define BOOST_UBLAS_CPP_GE_2011
 
+#elif BOOST_MSVC >= 1800
+
+#define BOOST_UBLAS_CPP_GE_2011
+
 #else
 
 #undef BOOST_UBLAS_CPP_GE_2011 // Make sure no one defined it
 
 #endif
-#define BOOST_UBLAS_CONSTEXPR constexpr // Every compiler besides MSVC<=1800
-
 
 // Microsoft Visual C++
 #if defined (BOOST_MSVC) && ! defined (BOOST_STRICT_CONFIG)
 
-// MSVC C++11
-#if BOOST_MSVC >= 1800
-#define BOOST_UBLAS_CPP_GE_2011
-#if (BOOST_MSVC == 1800)
-#define BOOST_UBLAS_CONSTEXPR //Hopefully versions over 1800 (MSVC2013) will include constexpr (picked from above)
-#endif
-#endif
-
-
 // Version 7.1
 #if BOOST_MSVC == 1310
 // One of these workarounds is needed for MSVC 7.1 AFAIK
@@ -308,3 +301,4 @@ bool disable_type_check<Dummy>::value = false;
 
 
 #endif
+