Fix export system