Fix for export annotations