Fix Trac #1525