You are right, that’s actually what I did and why I did not provide a Bugfix earlier. Your post just put me over the edge that I thought I give it a try. At least I am pretty sure now that I know where the mess is and that the bug will be gone after I do a proper code refactoring. Which I will certainly not do this week :-)
Cheers.
EDIT: Orignial is back now.