Fixing export issue