Fixes Trac #10506