Fix Trac #5084