Update to version 6.0.4