Export : small improvement