[Fixed] performance issues

Change-Id: I4223f0da2ce0344be2ba5ef2476fc7504d4a3cbe