Update to v3.0.7