Fix export when split boundaries