[fixed] stability issues

Change-Id: I748f4d645920a0b7b8d44ba3576a31392b11a605