[fixed] stability issues

Change-Id: Ib1bcf4ac270da7ed8a7d166e52938fd1a8de35c1