Fix and export