Fixing exports