Fix for the regression with 9.3.2 merge.