Correct bug fix around export time