Partial fix for Trac #4136