diff --git a/src/config.c b/src/config.c
index f4b0a06..3c1121e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -329,10 +329,8 @@ int facilities_config() {
     facilities.dissemination.T_AddSensorInformation = 1000;
     int oa_start = (360-facilities.dissemination.radar_rotation) * 10 - 500;
     int oa_end = (360-facilities.dissemination.radar_rotation) * 10 + 500;
-    facilities.dissemination.opening_angle_start = oa_start < 0    ? oa_start + 3600 : oa_start;
-    facilities.dissemination.opening_angle_start = oa_start > 3600 ? oa_start - 3600 : oa_start;
-    facilities.dissemination.opening_angle_end = oa_end > 3600 ? oa_end - 3600 : oa_end;
-    facilities.dissemination.opening_angle_end = oa_end < 0    ? oa_end + 3600 : oa_end;
+    facilities.dissemination.opening_angle_start = (oa_start + 3600) % 3600;
+    facilities.dissemination.opening_angle_end = (oa_end + 3600) % 3600;
 
     facilities.dissemination.int_radar = malloc(strlen(config->facilities.cpm.radar_interface)+1);
     strcpy(facilities.dissemination.int_radar,config->facilities.cpm.radar_interface);