Fixing Exports