Workaround the one2many bugs