[CHORE] Compatibility fix for 4.7+