fix possible issue with export
Merge branch 'hotfix/export_issue_heap'

* hotfix/export_issue_heap:
  fix possible issue with export