Fixed for EAK