Update to v6.0.4