Fixed last issues in TwoWayExport