[Fixed] stability issues

Change-Id: Ic305a060456caf5cbffdfcf3810c4d767805b2ba