improve performance
1.12.6-RC1