Bug fix #2
Arena fix