Added optimization for 3.2.