optimized some common paths
0.3.3