fix issue on export