Allow Multiple fields in flexifield's included content type's fields

Whenever I try to include a content which has a field that allows multiple values it breaks all the fields in the edit window that allow for multiple values.

Example:

1. Create content type with:
Label: anything
Name: anything
Type: text
Number of Values: Unlimited

2. In another content type create a flexifield using previously described content type, then set:
Label: anythingelse
Name: anythingelse
Type: flexifield
Number of Values: Unlimited

This results in broken drag handles and not being able to add fields properly when editing the corresponding node.

Thanks for reading and hopefully someone can come up with a patch.