diff --git a/panda/src/putil/cycleDataWriter.I b/panda/src/putil/cycleDataWriter.I
index cf100dee33..4c347d5165 100644
--- a/panda/src/putil/cycleDataWriter.I
+++ b/panda/src/putil/cycleDataWriter.I
@@ -200,7 +200,7 @@ CycleDataWriter(PipelineCycler<CycleDataType> &cycler) {
 template<class CycleDataType>
 INLINE CycleDataWriter<CycleDataType>::
 CycleDataWriter(PipelineCycler<CycleDataType> &cycler, bool) {
-  _pointer = _cycler->write();
+  _pointer = cycler.write();
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/putil/cyclerHolder.h b/panda/src/putil/cyclerHolder.h
index 5ae85fb0ef..b8d03e7d94 100644
--- a/panda/src/putil/cyclerHolder.h
+++ b/panda/src/putil/cyclerHolder.h
@@ -29,7 +29,7 @@
 //               PipelineCyclerBase object.  This is similar to a
 //               MutexHolder.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDAEXPRESS CyclerHolder {
+class EXPCL_PANDA CyclerHolder {
 public:
   INLINE CyclerHolder(PipelineCyclerBase &cycler);
   INLINE ~CyclerHolder();