Need to fix a regression introduced with 2.0.24