Fix for broken FormItemSet