fix cross border error