fix cross bug