diff --git a/openbr/core/common.h b/openbr/core/common.h
index 2c6c57c..166ee45 100644
--- a/openbr/core/common.h
+++ b/openbr/core/common.h
@@ -153,11 +153,10 @@ void MeanStdDev(const V<T> &vals, double *mean, double *stddev)
 template<template<typename> class C, typename T>
 T Median(C<T> vals, T *q1 = 0, T *q3 = 0)
 {
-    if (vals.isEmpty()) return std::numeric_limits<float>::quiet_NaN();
     qSort(vals);
-    if (q1 != 0) *q1 = vals[1*vals.size()/4];
-    if (q3 != 0) *q3 = vals[3*vals.size()/4];
-    return vals[vals.size()/2];
+    if (q1 != 0) *q1 = vals.isEmpty() ? 0 : vals[1*vals.size()/4];
+    if (q3 != 0) *q3 = vals.isEmpty() ? 0 : vals[3*vals.size()/4];
+    return vals.isEmpty() ? 0 : vals[vals.size()/2];
 }
 
 /*!