Fix Trac #1037