[fixed] Stability issue

Change-Id: Ib5febf921dbd62c981055e261aee5aaa0c016e43