Fix bug where gimmick would disable next wave