fixed export and import bugs