import/export bug fixing