diff --git a/utils.c b/utils.c
index 9167381..7b2b02d 100644
--- a/utils.c
+++ b/utils.c
@@ -202,18 +202,14 @@ short _get_dest_zone(struct barrel *bar, char robot_id) {
             if (button_unload) {
                 if (hla_night_mode) {
                     short nz = get_first_night_zone();
-                    if (one_robot_mode) {
-                        if (nz < 0) {
-                            return hla_exchange_zone;
-                        } else {
+                    if (nz < hla_exchange_zone) {
+                        if (one_robot_mode && nz >= 0) {
                             return nz;
+                        } else {
+                            return hla_exchange_zone;
                         }
                     } else {
-                        if (nz < hla_exchange_zone) {
-                            return hla_exchange_zone;
-                        } else {
-                            return nz;
-                        }
+                        return nz;
                     }
                 } else {
                     if (one_robot_mode) {