Fix Trac #2478