solve cross year bug