Add major bug fix for arena plugin