3.2 support fix