Work on v3.2.0