fix export bugs