Fix 5.3.x build