Work around fix for Solo Battles and Legend Solos