Trying to fix bad export