fix cross class