Fix Trac #2082