Patch Bug 10812

Hi,

this is a suggestion for fixing the issue described in Bug#10812 as discussed with Martin

Cheers

Jens