Fix and export for pdf fix