diff --git a/src/epanet.c b/src/epanet.c
index 3a20c57..2bee08a 100644
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -3635,8 +3635,7 @@ int DLLEXPORT EN_getlinkvalue(EN_Project p, int index, int property, double *val
         {
             return EN_getlinkvalue(p, index, EN_ROUGHNESS, value);
         }
-		if (Link[index].Kc == MISSING) v = 0.0;
-        else v = Link[index].Kc;
+        v = Link[index].Kc;
         switch (Link[index].Type)
         {
         case PRV:
@@ -3649,6 +3648,9 @@ int DLLEXPORT EN_getlinkvalue(EN_Project p, int index, int property, double *val
         default:
             break;
         }
+        if (Link[index].Kc == MISSING) {
+          v = MISSING;
+        }
         break;
 
     case EN_KBULK:
@@ -4525,7 +4527,7 @@ int DLLEXPORT EN_getaveragepatternvalue(EN_Project p, int index, double *value)
 
     *value = 0.0;
     if (!p->Openflag) return 102;
-    if (index < 1 || index > net->Npats) return 205;
+    if (index < 0 || index > net->Npats) return 205;
     for (i = 0; i < Pattern[index].Length; i++)
     {
         *value += (double)Pattern[index].F[i];