This bug occurs with cocoon-2.1.6. I have fixed it, but didn't checked in, because of the freeze.
I guess you can check in the changes since this is a bugfixing than adding a new features. Soon or less this could end in a bug for the new release.
Let it go in
Someone has already changed it. Sorry.