[Fixed] stability issue - patch by Haton

Change-Id: I9c8a1d3548d2bad39da9735557007092aa390e02