Work for 3.0.0