Fixing export bug