diff --git a/src/client/defs.h b/src/client/defs.h
index 93512370..3e7583b0 100644
--- a/src/client/defs.h
+++ b/src/client/defs.h
@@ -75,7 +75,7 @@ var bool g_cheats = false;
 
 #define READENTITY_ANGLE(field, changedflag) {\
 	if (flChanged & changedflag) {\
-		field = readshort() / (32767 / 360);\
+		field = readangle();\
 		PRINTFLAG(changedflag); \
 	}\
 }
diff --git a/src/server/defs.h b/src/server/defs.h
index 6f3e2789..7aa8f227 100644
--- a/src/server/defs.h
+++ b/src/server/defs.h
@@ -75,7 +75,7 @@
 
 #define SENDENTITY_ANGLE(field, changedflag) {\
 	if (flChanged & changedflag)\
-		WriteShort(MSG_ENTITY, field * 32767 / 360);\
+		WriteAngle(MSG_ENTITY, field);\
 }
 
 #define SENDENTITY_ENTITY(field, changedflag) {\