diff --git a/src/hb-null.hh b/src/hb-null.hh
index b87775b63e08c887fabab4a9cd674e10b02a0541..58151d72b7aca5c5053e6066498432f4531a1b22 100644
--- a/src/hb-null.hh
+++ b/src/hb-null.hh
@@ -50,7 +50,7 @@ template <typename T, typename B>
 struct _hb_null_size
 { enum { value = sizeof (T) }; };
 template <typename T>
-struct _hb_null_size<T, _hb_bool_type<(bool) (int) T::min_size> >
+struct _hb_null_size<T, _hb_bool_type<(bool) (1 + (unsigned int) T::min_size)> >
 { enum { value = T::null_size }; };
 
 template <typename T>