fix exporting
merge