diff --git a/src/game/puppycam2.c b/src/game/puppycam2.c
index d12251fdd..f3ea9dc45 100644
--- a/src/game/puppycam2.c
+++ b/src/game/puppycam2.c
@@ -1205,6 +1205,9 @@ static void puppycam_script(void) {
 
                     gPuppyCam.flags &= ~PUPPYCAM_BEHAVIOUR_YAW_ROTATION;
                 }
+                else {
+                    gPuppyCam.yaw = atan2s(gPuppyCam.pos[2] - gPuppyCam.focus[2], gPuppyCam.pos[0] - gPuppyCam.focus[0]);
+                }
 
                 if (volume.angles->pitch != PUPPY_NULL) {
                     gPuppyCam.pitchTarget = volume.angles->pitch;
diff --git a/src/game/puppycam2.h b/src/game/puppycam2.h
index 66dca9f03..3b2eacb4c 100644
--- a/src/game/puppycam2.h
+++ b/src/game/puppycam2.h
@@ -34,13 +34,13 @@
 #include "include/command_macros_base.h"
 
 #define PUPPYVOLUME(x, y, z, length, height, width, yaw, functionptr, anglesptr, addflags, removeflags, flagpersistance, room, shape, fov) \
-    CMD_BBH(0x3D, 0x24, x), \
+    CMD_BBH(0x3D, 0x28, x), \
     CMD_HHHHHH(y, z, length, height, width, yaw), \
     CMD_PTR(functionptr), \
     CMD_PTR(anglesptr), \
     CMD_W(addflags), \
     CMD_W(removeflags), \
-    CMD_BBH(flagpersistance, shape, room) \
+    CMD_BBH(flagpersistance, shape, room), \
     CMD_BBH(fov, 0x0, 0x0)
 
 struct gPuppyOptions