Support 3.0.4