Fix: Missing special code into export