[Fixed] Stability Issue

Change-Id: Ibec3adb22a20fcafb7ef93b98325d8c71f89add7