Draft fix for stuck on MeWaitingBuddyWorkingout state