Fix Trac #2017