Fix #2532710

Fixes trac #2532710