[fixed] stability issues

Change-Id: Ifdd0c679c75847ba9beefef76ea67ad15c178e76