EMC another fix