Re #7458 Fix issue with old API