fixing export ...