Fixed perf issue
v1.2