issue#23 perfomance tuning