Make it 6.0.2-compatible (more or less)