Fix 4629