Updated to v8.0.4