Work with 5.0.b