[fixed] stability issues

Change-Id: I74994b195a202aea21d391a51981c3db873b6200