diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h
index 72bbeeca0b..e4ac89f4dd 100644
--- a/src/App/PropertyContainer.h
+++ b/src/App/PropertyContainer.h
@@ -29,6 +29,7 @@
 #include <vector>
 #include <string>
 #include <memory>
+#include <limits>
 #include <Base/Persistence.h>
 
 #include "DynamicProperty.h"
@@ -143,7 +144,7 @@ struct AppExport PropertyData
       short int getOffsetTo(const App::Property* prop) const {
             auto *pt = (const char*)prop;
             auto *base = (const char *)m_container;
-            if(pt<base || pt>base+SHRT_MAX)
+            if(pt<base || pt>base+std::numeric_limits<short>::max())
                 return -1;
             return (short) (pt-base);
       }