Fix after upgrade to 2.4.17 R66