Fix game & Batch