Fix 2663