Fix for exports