Fix export_class