The attached patch is a proposed fix for issue2512. Regarding coding
style, I tried to be faithful to the original code it replaces.
"issue2512-test-and-fix.dpatch" contains the test and the resolution to
issue2512 in a single bundle.
With kind regards
Stephan-A. Posselt