Critical bug corrected on export