Fix current class for X/O