[fixed] stability issues

Change-Id: I999f1a2a8c742559134c47697910cd1c5d01ec14