Fix options not taken in account during export