Bugfix #2630 2nd attempt