Fix unstable issue