Export fix