Thanks. This indeed fixes the issue - together with the second hunk of my patch. I removed the first hunk. I've submitted the package now to factory/TW. Closing bug.