Fix Trac #3092