Fix 8880 bug