Fix Trac #10519