Quick hack to work around export bug