diff --git a/src/rec/calcRecord.c b/src/rec/calcRecord.c
index 714a63c16..768d2aedb 100644
--- a/src/rec/calcRecord.c
+++ b/src/rec/calcRecord.c
@@ -350,10 +350,10 @@ struct calcRecord *pcalc;
 	for(i=0, plink=&pcalc->inpa, pvalue=&pcalc->a;
             i<NO_OF_INPUTS;
             i++, plink++, pvalue++) {
+            int newStatus;
 
-            status = dbGetLink(plink,DBR_DOUBLE, pvalue,0,0);
-
-	    if (!RTN_SUCCESS(status)) return(status);
+            newStatus = dbGetLink(plink,DBR_DOUBLE, pvalue,0,0);
+	    if(status==0) status = newStatus;
 	}
-	return(0);
+	return(status);
 }
diff --git a/src/rec/calcoutRecord.c b/src/rec/calcoutRecord.c
index 959449a75..49b8560b0 100644
--- a/src/rec/calcoutRecord.c
+++ b/src/rec/calcoutRecord.c
@@ -662,12 +662,12 @@ static int fetch_values(pcalc)
 
 	for(i=0, plink=&pcalc->inpa, pvalue=&pcalc->a; i<NO_OF_INPUTS; 
             i++, plink++, pvalue++) {
+            int newStatus;
 
-            status = dbGetLink(plink,DBR_DOUBLE, pvalue,0,0);
-
-	    if (!RTN_SUCCESS(status)) return(status);
+            newStatus = dbGetLink(plink,DBR_DOUBLE, pvalue,0,0);
+            if(status==0) status = newStatus;
 	}
-	return(0);
+	return(status);
 }
 
 static void checkLinksCallback(CALLBACK *arg)