[fixed] stability issues

Change-Id: I8b9b99beb22d40cc176e4046330cd8501eabcd71