Minor performance optimization
0.4.1