fix export accordingly