Fix 71776ba

Fix commit 71776bacccf51d0dc3abec48143f02c6452d3f8f
Have commit 71776ba tested

The commit 71776bacccf51d0dc3abec48143f02c6452d3f8f has been fully tested.

The performance is believed to improve by 25 times theroically.