Corrected defunctioning export