Yes, that seems to fix it. It also fixes the issue that started this whole thread where I was seeing all the attributes for the group itself when I tried to create it.
Did you submit this as a patch or should I?
