Update to 6.0.1.Final