[3.8] Fix 1476