Get working with 6.0.2