added support for 3.2.X