Should fix laziness issues for one-to-many and many-to-many