Fix Trac #2611