Fixing export