Test Trac #2247