related to #143 : perf improvment