Fix Trac #4966