perf improvment - fix #20
perf improvment - fix #20