Fix for R88 API change