Corrected export mechanism