More arena fix