diff --git a/src/std/rec/waveformRecord.c b/src/std/rec/waveformRecord.c
index 76e06a681..513f61029 100644
--- a/src/std/rec/waveformRecord.c
+++ b/src/std/rec/waveformRecord.c
@@ -163,7 +163,6 @@ static long cvt_dbaddr(DBADDR *paddr)
 {
     waveformRecord *prec = (waveformRecord *) paddr->precord;
 
-    paddr->pfield = prec->bptr;
     paddr->no_elements = prec->nelm;
     paddr->field_type = prec->ftvl;
     paddr->field_size = dbValueSize(prec->ftvl);
@@ -176,6 +175,7 @@ static long get_array_info(DBADDR *paddr, long *no_elements, long *offset)
 {
     waveformRecord *prec = (waveformRecord *) paddr->precord;
 
+    paddr->pfield = prec->bptr;
     *no_elements = prec->nord;
     *offset = 0;
 
@@ -300,7 +300,7 @@ static void monitor(waveformRecord *prec)
     }
 
     if (monitor_mask) {
-        db_post_events(prec, prec->bptr, monitor_mask);
+        db_post_events(prec, (void*)&prec->val, monitor_mask);
     }
 }