fixed export to have proper parents