Updated when building 3.2