CCK divs are not closed

Hi, I found a bug that I haven't been able to solve yet, but I think I have tracked it down:

If you chose to display a SCO as a pop up this breaks div-based layouts as the three divs the CCK field creates (see screenshot) is not closed. This is "fixable" by changing line 151 in player.php from

$output.=">"; to

$output.="></div></div></div>";

but that totally breaks the layout if you chose the embedded version again.

So, seems to me that the divs created by the CCK field is closed if you choose embedded display, but are not if you choose popup?