Somehow this reads as if there is some bugs in the old code?!