improve perf
Merge pull request #1278 from syureyi/perf

improve perf