Fix the exporting issue