Fix 2994