v0.3.0.7: speed up rebuilding