FIX: import/export bug