handler: improve perf
1.0.1