Fix the 2.3.2 upgrade