fix a fork case scenario