Fix for Trac #12469