v3.0.1 fixed