diff --git a/client/src/events.jsx b/client/src/events.jsx
index 59fd62af..8870bde8 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -78,9 +78,10 @@ function registerEvents(store) {
                         store.dispatch(actions.setAnimSource(null));
                         store.dispatch(actions.setAnimTarget(null));
                         store.dispatch(actions.setAnimText(null));
+                        store.dispatch(actions.setAnimFocus([]));
                         // We currently need another small timeout so that everything can properly dismount / unload
                         // Otherwise 3 x Attack on same target will only render the first time
-                        return setTimeout(cb, 75);
+                        return setTimeout(cb, 200);
                     }, timeout);
                 }, err => {
                     if (err) return console.error(err);
diff --git a/server/src/player.rs b/server/src/player.rs
index ca233a34..496b4c21 100644
--- a/server/src/player.rs
+++ b/server/src/player.rs
@@ -145,9 +145,9 @@ impl Player {
                 if free_colours < 2 {
                     break;
                 }
-                self.bot_vbox_accept(0).expect("could't accept colour 0");
-                self.bot_vbox_accept(0).expect("could't accept colour 1");
-                self.bot_vbox_accept(group_i).expect("could't accept group 0");
+                self.bot_vbox_accept(0).expect("could't accept colour item");
+                self.bot_vbox_accept(0).expect("could't accept colour item");
+                self.bot_vbox_accept(group_i).expect("could't accept group item");
             }
 
             // info!("{:?}", self.vbox.bound);